Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bacpop-194 All Beebop changes for multi-db #81

Merged
merged 13 commits into from
Oct 9, 2024

Conversation

absternator
Copy link
Contributor

@absternator absternator commented Oct 3, 2024

This PR covers all changes that will be needed for multi-db.When the beebop_py portion of work is done, this can be then merged and tested with that branch. Currently I ve tested with beebop_py poc. Feel free to look for context and play around (API branch is pointing to that poc branch).

The following is done in this PR

  • Get species info with kmers from API
  • pass species info when running poppunk
  • remove DB_LOCATION related config

Remove the unused import in CreateProjectButton.vue to improve code cleanliness and maintainability.
The README.md file was updated to provide clearer instructions for adding new species to the project. The step to add a new database to [mrcdata](https://mrcdata.dide.ic.ac.uk/beebop) was removed, as it is now handled by the `download_db` script in *beebop_py*. The step to add a new species to `args.json` in *beebop_py* remains unchanged.
Copy link

codecov bot commented Oct 3, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.72%. Comparing base (2add392) to head (7d3a396).

Additional details and impacted files
@@                   Coverage Diff                   @@
##           bacpop-188-mutli-db      #81      +/-   ##
=======================================================
+ Coverage                98.69%   98.72%   +0.03%     
=======================================================
  Files                       33       34       +1     
  Lines                     1914     1966      +52     
  Branches                   242      246       +4     
=======================================================
+ Hits                      1889     1941      +52     
  Misses                      24       24              
  Partials                     1        1              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Collaborator

@EmmaLRussell EmmaLRussell left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code looks good to me.

AMR for strep samples always shows as "unknown" - is that expected? This is on running this branch with the run_test script.

One thing I forgot to ask in the last PR - will the code be backward compatible with old projects stored without a "species" field. Looks like it probably default to undefined, but should default to pneumo: https://github.com/bacpop/beebop/pull/80/files#diff-6b11b12f8cdd9323969a2b053f174be528aebc9603ca7ef6c174af538c441534R104

@@ -109,5 +107,14 @@ export default (config) => {
handleAPIError(request, response, error);
});
},

async getSketchKmerArguments(request, response) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might be less confusing to call this getSpeciesConfig - that seems to be the terminology elsewhere in the chain, and other config might get added in future.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good catch i missed this in renaming haha

@absternator
Copy link
Contributor Author

absternator commented Oct 7, 2024

AMR for strep samples always shows as "unknown" - is that expected? This is on running this branch with the run_test script.

One thing I forgot to ask in the last PR - will the code be backward compatible with old projects stored without a "species" field. Looks like it probably default to undefined, but should default to pneumo: https://github.com/bacpop/beebop/pull/80/files#diff-6b11b12f8cdd9323969a2b053f174be528aebc9603ca7ef6c174af538c441534R104

  1. Yip I think it is expected, but nick said to just run it anyways initially. But Il follow up on it with him
  2. oh yes good catch,.. I could do default .., or could run a data migration that sets all current projects species to pneumo.. that way it wont bloat code with unnecessary defaults.. that migration will get merged in first! PR up --> Bacpop-197 Add Data migration to set default species to pneumo beebop-deploy#6

- Added the --pull always flag to the docker run command in the run_dependencies script. This ensures that the latest version of the mrcide/beebop-py image is always pulled before running the script.

Refactor: Update test file errors.test.ts

- Reordered the import statements in the errors.test.ts file to match the specified order.
- Updated the newProject function to include the species parameter when creating a new project.
- Updated the projectData variable in the test function to include the species parameter when calling the testSample function.
Copy link
Collaborator

@EmmaLRussell EmmaLRussell left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice - species name in bold looks good!

@absternator absternator merged commit e83fa36 into bacpop-188-mutli-db Oct 9, 2024
11 checks passed
@absternator absternator deleted the bacpop-194-popunk-run branch October 9, 2024 10:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants